From ef158efab8e92415a3f02d93831ab01a6a3dc704 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sun, 15 Jun 2025 09:11:27 +0200 Subject: [PATCH] stress: drop old unmaintained project As a replacement for this project despite it was resurrected, it is not maintained. We added stress-ng [1], which is regularly updated and gets new features and there is no reason to have two packages in this repository. [1] fba6bb94895e443830cfa28a1937cb7caf8dab8d ("stress-ng: add") Signed-off-by: Josef Schlehofer (cherry picked from commit 74aaf9c1317addec09c586e710c94caafed40b23) --- utils/stress-ng/Makefile | 1 + utils/stress/Makefile | 45 ----------------------- utils/stress/patches/010-usleep.patch | 51 --------------------------- 3 files changed, 1 insertion(+), 96 deletions(-) delete mode 100644 utils/stress/Makefile delete mode 100644 utils/stress/patches/010-usleep.patch diff --git a/utils/stress-ng/Makefile b/utils/stress-ng/Makefile index a41265ad03..18a3131b60 100644 --- a/utils/stress-ng/Makefile +++ b/utils/stress-ng/Makefile @@ -28,6 +28,7 @@ define Package/stress-ng TITLE:=stress-ng is a stress test utility URL:=https://github.com/ColinIanKing/stress-ng DEPENDS:=+zlib +libbsd +libaio +libsctp +libkmod +libatomic +libjpeg + PROVIDES:=stress endef define Package/stress-ng/description diff --git a/utils/stress/Makefile b/utils/stress/Makefile deleted file mode 100644 index 8e13158e5b..0000000000 --- a/utils/stress/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# Copyright (C) 2006-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=stress -PKG_VERSION:=1.0.7 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=https://github.com/resurrecting-open-source-projects/stress/releases/download/${PKG_VERSION}/ -PKG_HASH:=e63adb57597e617c14ecb0d841b5d990460796d9e9ec69bd56fe645ef02eb239 - -PKG_MAINTAINER:=Alexandru Ardelean -PKG_LICENSE:=GPL-2.0-only -PKG_LICENSE_FILES:=COPYING - -PKG_FIXUP:=autoreconf -PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/stress - SECTION:=utils - CATEGORY:=Utilities - TITLE:=stress is a simple stress utility - URL:= -endef - -define Package/stress/description -stress is a simple tool that imposes certain types of compute \ stress on -UNIX-like operating systems. -endef - -define Package/stress/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/stress $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,stress)) diff --git a/utils/stress/patches/010-usleep.patch b/utils/stress/patches/010-usleep.patch deleted file mode 100644 index 02a2201848..0000000000 --- a/utils/stress/patches/010-usleep.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/src/stress.c -+++ b/src/stress.c -@@ -266,9 +266,12 @@ main (int argc, char **argv) - while ((forks = (do_cpu + do_io + do_vm + do_hdd))) - { - long long backoff, timeout = 0; -+ struct timespec b; - - /* Calculate the backoff value so we get good fork throughput. */ - backoff = do_backoff * forks; -+ b.tv_sec = backoff / 1000000; -+ b.tv_nsec = (backoff % 1000000) * 1000; - dbg (stdout, "using backoff sleep of %llius\n", backoff); - - /* If we are supposed to respect a timeout, calculate it. */ -@@ -304,7 +307,7 @@ main (int argc, char **argv) - case 0: /* child */ - worker_init(); - alarm (timeout); -- usleep (backoff); -+ nanosleep (&b, NULL); - if (do_dryrun) - exit (0); - exit (hogcpu ()); -@@ -326,7 +329,7 @@ main (int argc, char **argv) - case 0: /* child */ - worker_init(); - alarm (timeout); -- usleep (backoff); -+ nanosleep (&b, NULL); - if (do_dryrun) - exit (0); - exit (hogio ()); -@@ -347,7 +350,7 @@ main (int argc, char **argv) - case 0: /* child */ - worker_init(); - alarm (timeout); -- usleep (backoff); -+ nanosleep (&b, NULL); - if (do_dryrun) - exit (0); - exit (hogvm (do_vm_bytes, do_vm_stride, do_vm_hang, do_vm_keep)); -@@ -368,7 +371,7 @@ main (int argc, char **argv) - case 0: /* child */ - worker_init(); - alarm (timeout); -- usleep (backoff); -+ nanosleep (&b, NULL); - if (do_dryrun) - exit (0); - exit (hoghdd (do_hdd_bytes)); -- 2.30.2